From: Kenichi Handa <handa@m17n.org>
Date: Thu, 14 Oct 2010 02:06:31 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~16^2~36
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=15d5d2f56521dbe57e5297ef83c61df09383eca3;p=emacs.git

merge emacs-23
---

15d5d2f56521dbe57e5297ef83c61df09383eca3
diff --cc lisp/ChangeLog
index 419a61ed5f3,c4501dbc219..56dec3f9421
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,18 -1,21 +1,28 @@@
 +2010-10-14  Kenichi Handa  <handa@m17n.org>
 +
 +	* ps-mule.el (ps-mule-font-spec-list): Delete it.  Not used
 +	anymore.
 +	(ps-mule-begin-job): Fix for the case that only ENCODING is set in
 +	a font-spec (bug#7197).
 +
-  2010-10-10  Jan Djärv  <jan.h.d@swipnet.se>
-  
-  	* term/ns-win.el (ns-right-alternate-modifier): New defvar.
-  	(ns-right-option-modifier): New alias for ns-right-alternate-modifier.
-  	(mac-right-option-modifier): New alias for ns-right-option-modifier.
-  
-  	* cus-start.el (all): ns-right-alternate-modifier is new.
-  
+ 2010-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org.
+ 
+ 2010-10-12  Juanma Barranquero  <lekktu@gmail.com>
+ 
+ 	* international/mule.el (define-coding-system):
+ 	* international/titdic-cnv.el (quail-cxterm-package-ext-info):
+ 	* composite.el (compose-region): Fix typo in docstring.
+ 
+ 2010-10-10  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+ 	* term/ns-win.el (ns-right-alternate-modifier): New defvar.
+ 	(ns-right-option-modifier): New alias for ns-right-alternate-modifier.
+ 	(mac-right-option-modifier): New alias for ns-right-option-modifier.
+ 
+ 	* cus-start.el (all): ns-right-alternate-modifier is new.
+ 
  2010-10-10  Andreas Schwab  <schwab@linux-m68k.org>
  
  	* Makefile.in (ELCFILES): Update.